Перенесы слизне-котики, а также добавлены именные вещи Syrel #515
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Merge Conflict
Changes: Sprites
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
RSI Diff Bot; head commit 65f854f merging into 06834f7 Resources/Textures/ADT/Mobs/slug-cat.rsi
Resources/Textures/ADT/Personalization/syrel_battleaxe.rsi
Resources/Textures/ADT/Personalization/syrel_sheath.rsi
|
|
если кто-то знает как упростить локаль слизне-котика подскажите |
FaDeOkno
previously requested changes
Sep 23, 2024
Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/SlugCats/slugcat.ftl
Outdated
Show resolved
Hide resolved
|
Ути какие слаймики |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Inconnu1337
force-pushed
the
ADTSlugCat
branch
from
a477a29 to
75325dd
Compare
|
ошибка с крашем клиента исправлена |
1Stepka1
previously requested changes
Sep 24, 2024
Inconnu1337
force-pushed
the
ADTSlugCat
branch
from
5feeb2b to
364ffb5
Compare
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Bolper
reviewed
Sep 24, 2024
|
Теперь чини тесты |
Inconnu1337
force-pushed
the
ADTSlugCat
branch
from
c9a7890 to
364ffb5
Compare
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
ПОЧИНЕНО |
Schrodinger71
approved these changes
Sep 25, 2024
Comment on lines
+1
to
+17
| ent-ADTMobSlugCatCreek = слизне-кот | ||
| .desc = Удивительное существо, похожее одновременно на кота и слизня. Но это не слизень, если приглядеться можно понять что у него просто очень скользкая кожа. Очень ловкие и умные. | ||
|
|
||
| ent-ADTMobSlugCatHoly = { ent-ADTMobSlugCatCreek } | ||
| .desc = { ent-ADTMobSlugCatCreek.desc } | ||
|
|
||
| ent-ADTMobSlugCatMonk = { ent-ADTMobSlugCatCreek } | ||
| .desc = { ent-ADTMobSlugCatCreek.desc } | ||
|
|
||
| ent-ADTMobSlugCatSpearMaster = { ent-ADTMobSlugCatCreek } | ||
| .desc = { ent-ADTMobSlugCatCreek.desc } | ||
|
|
||
| ent-ADTMobSlugCatTechnician = { ent-ADTMobSlugCatCreek } | ||
| .desc = { ent-ADTMobSlugCatCreek.desc } | ||
|
|
||
| ent-ADTMobSlugCatSonfariel = { ent-ADTMobSlugCatCreek } | ||
| .desc = { ent-ADTMobSlugCatCreek.desc } |
There was a problem hiding this comment.
В целом всё ок, но у тебя слизне-коты разного цвета, наверн можно было бы и имя каждому прописать, красный, синий, зелёный и т.д.
крит. ошибок не заметил
Merged
via the queue into
AdventureTimeSS14:master
with commit Sep 25, 2024
b066863
15 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Описание PR
Перенесы слизне-котики со старой сборки и улучшены по заказу sadboiiiiiiiiiiiiiiiiiiiii
Добавлен именной боевой топор и чехол для него [Syrel]
Почему / Баланс
Медиа
Требования
Чейнджлог
🆑 Inconnu